/var/tmp supports extended attributes)
* debian/rules: clean up stale gpg-agent processes after testing
* debian/rules: warn if there are leftover daemon processes after testing
- * debian/patches: add patches to get the build-time tests passing under
- sbuild
* debian/ostree-tests.lintian-overrides: override a couple of false
positives
* Run dh_auto_test with VERBOSE=1, to get logs with older debhelper
- * Add a patch to skip a test with non-GNU parallel more reliably
-- Simon McVittie <smcv@debian.org> Mon, 28 Mar 2016 12:02:59 +0100
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 08:27:32 +0100
-Subject: In tests that use gpg, terminate the gpg-agent after testing
-
-Otherwise we leak those processes.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/b25ddd29ab8eb56bc1022dd38758e54dc4b2ccbe
----
- tests/test-commit-sign.sh | 1 +
- tests/test-gpg-signed-commit.sh | 2 ++
- tests/test-pull-mirror-summary.sh | 2 ++
- tests/test-pull-summary-sigs.sh | 2 ++
- tests/test-remote-gpg-import.sh | 1 +
- 5 files changed, 8 insertions(+)
-
-diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
-index 8d52bca..1b153e9 100755
---- a/tests/test-commit-sign.sh
-+++ b/tests/test-commit-sign.sh
-@@ -132,5 +132,6 @@ if ${CMD_PREFIX} ostree --repo=repo show main | grep -o 'Found [[:digit:]] signa
- fi
-
- rm -rf repo gnomerepo-files
-+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
-
- echo "ok"
-diff --git a/tests/test-gpg-signed-commit.sh b/tests/test-gpg-signed-commit.sh
-index a0bf983..096c0e1 100755
---- a/tests/test-gpg-signed-commit.sh
-+++ b/tests/test-gpg-signed-commit.sh
-@@ -78,4 +78,6 @@ if ${OSTREE} show test2 | grep -o 'Found [[:digit:]] signature'; then
- assert_not_reached
- fi
-
-+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
-+
- echo "ok"
-diff --git a/tests/test-pull-mirror-summary.sh b/tests/test-pull-mirror-summary.sh
-index 20707a1..d5e27fc 100755
---- a/tests/test-pull-mirror-summary.sh
-+++ b/tests/test-pull-mirror-summary.sh
-@@ -121,3 +121,5 @@ echo "ok pull mirror with invalid summary sig and no verification"
- # assert_file_has_content deltas.txt "${origmain}-${newmain}"
-
- # echo "ok pull mirror with signed summary covering static deltas"
-+
-+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
-diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh
-index 202efda..dd2fcb0 100755
---- a/tests/test-pull-summary-sigs.sh
-+++ b/tests/test-pull-summary-sigs.sh
-@@ -133,3 +133,5 @@ assert_file_has_content summary.txt "Good signature from \"Ostree Tester <test@t
- grep static-deltas summary.txt > static-deltas.txt
- assert_file_has_content static-deltas.txt \
- $(${OSTREE} --repo=repo rev-parse origin:main)
-+
-+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
-diff --git a/tests/test-remote-gpg-import.sh b/tests/test-remote-gpg-import.sh
-index bb0c402..aa90eb8 100755
---- a/tests/test-remote-gpg-import.sh
-+++ b/tests/test-remote-gpg-import.sh
-@@ -143,4 +143,5 @@ if ${OSTREE} pull R2:main >/dev/null 2>&1; then
- fi
- ${OSTREE} pull R3:main >/dev/null
-
-+gpg-connect-agent --homedir ${test_tmpdir}/gpghome killagent /bye
- echo "ok"
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 18:36:04 +0100
-Subject: Load g-i bindings from builddir during build-time testing
-
-Previously, the build-time tests would only pass if the g-i bindings to
-OSTree were already installed, with a reasonably similar version.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/07aa8e1c76463e3de0ffc79d0271773ababf05b4
-[smcv: backport to 2016.4]
----
- Makefile-tests.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 9eb9ad8..e7c2395 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -23,7 +23,10 @@ include $(top_srcdir)/buildutil/glib-tap.mk
- # include the builddir in $PATH so we find our just-built ostree
- # binary.
- TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
-- PATH=$$(cd $(top_builddir) && pwd):$${PATH}
-+ GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
-+ LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
-+ PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
-+ $(NULL)
-
- test_scripts = \
- tests/test-basic.sh \
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 14:32:55 +0100
-Subject: Probe for GNU parallel more accurately
-
-moreutils parallel isn't compatible with the command-line syntax
-used here. Because it doesn't implement GNU-style --help and exits 1
-when that option is given, this test was correctly skipped when
-using moreutils parallel, but only by mistake.
-
-moreutils parallel might conceivably gain --help and --version in
-future, but hopefully nothing incompatible with GNU parallel is going
-to gain a --gnu option.
-
-Also use the --gnu option to force the new command-line semantics;
-some versions optionally supported an incompatible command-line syntax
-taken from moreutils parallel.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/9dafc820241ed6e663ad4093660fc255f549aa26
----
- tests/test-admin-locking.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test-admin-locking.sh b/tests/test-admin-locking.sh
-index 564295d..01814f9 100755
---- a/tests/test-admin-locking.sh
-+++ b/tests/test-admin-locking.sh
-@@ -25,8 +25,8 @@ set -euo pipefail
- setup_os_repository "archive-z2" "syslinux"
-
- # If parallel is not installed, skip the test
--if ! parallel --help >/dev/null 2>&1; then
-- echo "1..0 # SKIP no /usr/bin/parallel"
-+if ! parallel --gnu /bin/true </dev/null >/dev/null 2>&1; then
-+ echo "1..0 # SKIP GNU parallel not available"
- exit 0
- fi
-
-@@ -42,7 +42,7 @@ echo "rev=${rev}"
- ${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
- assert_has_dir sysroot/boot/ostree/testos-${bootcsum}
-
--parallel_cmd=parallel
-+parallel_cmd="parallel --gnu"
- if parallel --help | grep -q -e --no-notice; then
- parallel_cmd="${parallel_cmd} --no-notice"
- fi
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 13:44:27 +0100
-Subject: Skip tests that run rofiles-fuse if /dev/fuse or /etc/mtab
- unavailable
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/e1ce859368b41c863fe096df84f1ff33e90d725f
----
- tests/libtest.sh | 17 +++++++++++++++++
- tests/test-demo-buildsystem.sh | 6 +-----
- tests/test-rofiles-fuse.sh | 6 +-----
- 3 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/tests/libtest.sh b/tests/libtest.sh
-index 21de2e8..3e4c4bd 100755
---- a/tests/libtest.sh
-+++ b/tests/libtest.sh
-@@ -332,3 +332,20 @@ skip_without_user_xattrs () {
- exit 0
- fi
- }
-+
-+skip_without_fuse () {
-+ if ! fusermount --version >/dev/null 2>&1; then
-+ echo "1..0 # SKIP no fusermount"
-+ exit 0
-+ fi
-+
-+ if ! [ -w /dev/fuse ]; then
-+ echo "1..0 # SKIP no write access to /dev/fuse"
-+ exit 0
-+ fi
-+
-+ if ! [ -e /etc/mtab ]; then
-+ echo "1..0 # SKIP no /etc/mtab"
-+ exit 0
-+ fi
-+}
-diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh
-index bffa59c..97915f9 100755
---- a/tests/test-demo-buildsystem.sh
-+++ b/tests/test-demo-buildsystem.sh
-@@ -19,13 +19,9 @@
-
- set -euo pipefail
-
--if ! fusermount --version >/dev/null 2>&1; then
-- echo "1..0 # SKIP no fusermount"
-- exit 0
--fi
--
- . $(dirname $0)/libtest.sh
-
-+skip_without_fuse
- skip_without_user_xattrs
-
- echo "1..1"
-diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh
-index ba45959..d021df0 100755
---- a/tests/test-rofiles-fuse.sh
-+++ b/tests/test-rofiles-fuse.sh
-@@ -19,13 +19,9 @@
-
- set -euo pipefail
-
--if ! fusermount --version >/dev/null 2>&1; then
-- echo "1..0 # SKIP no fusermount"
-- exit 0
--fi
--
- . $(dirname $0)/libtest.sh
-
-+skip_without_fuse
- skip_without_user_xattrs
-
- setup_test_repository "bare-user"
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 28 Mar 2016 13:46:23 +0100
-Subject: Symlink libreaddir-rand.so into tests directory
-
-This means it can be LD_PRELOADed during build-time testing.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/f8bef792cb9cdd8b9cd174dad5856727db3b9bad
----
- .gitignore | 1 +
- Makefile-decls.am | 3 +++
- Makefile-tests.am | 4 ++++
- 3 files changed, 8 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index d241cab..f37ca48 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -70,6 +70,7 @@ _build
- /test-remote-add.test
- /test-setuid.test
- /test-xattrs.test
-+/tests/libreaddir-rand.so
- test-varint
- test*.test
- *.trs
-diff --git a/Makefile-decls.am b/Makefile-decls.am
-index a5c9d50..eefffd6 100644
---- a/Makefile-decls.am
-+++ b/Makefile-decls.am
-@@ -49,3 +49,6 @@ GITIGNOREFILES =
- # This is a special facility to chain together hooks easily
- INSTALL_DATA_HOOKS =
- install-data-hook: $(INSTALL_DATA_HOOKS)
-+
-+ALL_LOCAL_RULES =
-+all-local: $(ALL_LOCAL_RULES)
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 9f359ad..9eb9ad8 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -211,6 +211,10 @@ EXTRA_DIST += \
- tests/gpg-verify-data/trustdb.gpg \
- tests/gpg-verify-data/gpg.conf
-
-+tests-libreaddir-rand-so-symlink:
-+ ln -fns ../.libs/libreaddir-rand.so tests
-+ALL_LOCAL_RULES += tests-libreaddir-rand-so-symlink
-+
- # Unfortunately the glib test data APIs don't actually handle
- # non-recursive Automake, so we change our code to canonically look
- # for tests/ which is just a symlink when installed.
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 17:52:57 +0100
-Subject: libtest.sh: only check whether $(pwd) is empty once
-
-test-sysroot.js runs libtestExec() twice, one of which is after
-creating non-hidden directories in $(pwd), so this check needs to be
-skipped the second time.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/18e9169d7ae76149833475c14f4c7147f6f91c9e
----
- tests/libtest.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/libtest.sh b/tests/libtest.sh
-index f588e65..f22ba4b 100755
---- a/tests/libtest.sh
-+++ b/tests/libtest.sh
-@@ -41,8 +41,12 @@ test_tmpdir=$(pwd)
- if ! test -f .testtmp; then
- files=$(ls)
- if test -n "${files}"; then
-+ ls -l
- assert_not_reached "test tmpdir=${test_tmpdir} is not empty; run this test via \`make check TESTS=\`, not directly"
- fi
-+ # Remember that this is an acceptable test $(pwd), for the benefit of
-+ # C and JS tests which may source this file again
-+ touch .testtmp
- fi
-
- export G_DEBUG=fatal-warnings
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 18:29:44 +0100
-Subject: libtest.sh: use G_TEST_SRCDIR, G_TEST_BUILDDIR to find resources
-
-This fixes the bug that in installed-tests that run testlib.sh under
-"bash -c" (i.e. the C and JS tests), $(dirname $0) is "." and we can't do
-the LD_PRELOAD correctly:
-
-ERROR: ld.so: object './libreaddir-rand.so' from LD_PRELOAD cannot be
-preloaded (cannot open shared object file): ignored.
-
-Similarly, those tests can't copy gpghome correctly.
-
-This also removes the confusing situation that SRCDIR in libtest.sh
-(which is ${top_srcdir}/tests) does not mean the same thing as SRCDIR
-in test-abi.sh (which is just ${top_srcdir}).
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/efb86ba9d32a038dd90f47f6e82f578e91b5fef5
----
- tests/libtest.sh | 18 ++++++++++++++----
- tests/test-archivez.sh | 2 +-
- tests/test-delta.sh | 4 ++--
- tests/test-pull-archive-z.sh | 2 +-
- 4 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/tests/libtest.sh b/tests/libtest.sh
-index 3e4c4bd..f588e65 100755
---- a/tests/libtest.sh
-+++ b/tests/libtest.sh
-@@ -17,7 +17,17 @@
- # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- # Boston, MA 02111-1307, USA.
-
--SRCDIR=$(dirname $0)
-+if [ -n "${G_TEST_SRCDIR:-}" ]; then
-+ test_srcdir="${G_TEST_SRCDIR}/tests"
-+else
-+ test_srcdir=$(dirname $0)
-+fi
-+
-+if [ -n "${G_TEST_BUILDDIR:-}" ]; then
-+ test_builddir="${G_TEST_BUILDDIR}/tests"
-+else
-+ test_builddir=$(dirname $0)
-+fi
-
- assert_not_reached () {
- echo $@ 1>&2; exit 1
-@@ -54,7 +64,7 @@ export TEST_GPG_KEYID_3="DF444D67"
- # homedir in order to create lockfiles. Work around
- # this by copying locally.
- echo "Copying gpghome to ${test_tmpdir}"
--cp -a ${SRCDIR}/gpghome ${test_tmpdir}
-+cp -a "${test_srcdir}/gpghome" ${test_tmpdir}
- export TEST_GPG_KEYHOME=${test_tmpdir}/gpghome
- export OSTREE_GPG_HOME=${test_tmpdir}/gpghome/trusted
-
-@@ -63,9 +73,9 @@ if test -n "${OT_TESTS_DEBUG:-}"; then
- fi
-
- if test -n "${OT_TESTS_VALGRIND:-}"; then
-- CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${SRCDIR}/ostree-valgrind.supp"
-+ CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/ostree-valgrind.supp"
- else
-- CMD_PREFIX="env LD_PRELOAD=${SRCDIR}/libreaddir-rand.so"
-+ CMD_PREFIX="env LD_PRELOAD=${test_builddir}/libreaddir-rand.so"
- fi
-
- assert_streq () {
-diff --git a/tests/test-archivez.sh b/tests/test-archivez.sh
-index 999157d..b879328 100755
---- a/tests/test-archivez.sh
-+++ b/tests/test-archivez.sh
-@@ -25,7 +25,7 @@ echo '1..11'
-
- setup_test_repository "archive-z2"
-
--. ${SRCDIR}/archive-test.sh
-+. ${test_srcdir}/archive-test.sh
-
- cd ${test_tmpdir}
- mkdir repo2
-diff --git a/tests/test-delta.sh b/tests/test-delta.sh
-index a6fd6f8..411e9b0 100755
---- a/tests/test-delta.sh
-+++ b/tests/test-delta.sh
-@@ -130,9 +130,9 @@ assert_streq "${totalsize_orig}" "${totalsize_swapped}"
-
- echo 'ok generate + show endian swapped'
-
--tar xf ${SRCDIR}/pre-endian-deltas-repo-big.tar.xz
-+tar xf ${test_srcdir}/pre-endian-deltas-repo-big.tar.xz
- mv pre-endian-deltas-repo{,-big}
--tar xf ${SRCDIR}/pre-endian-deltas-repo-little.tar.xz
-+tar xf ${test_srcdir}/pre-endian-deltas-repo-little.tar.xz
- mv pre-endian-deltas-repo{,-little}
- legacy_origrev=$(${CMD_PREFIX} ostree --repo=pre-endian-deltas-repo-big rev-parse main^)
- legacy_newrev=$(${CMD_PREFIX} ostree --repo=pre-endian-deltas-repo-big rev-parse main)
-diff --git a/tests/test-pull-archive-z.sh b/tests/test-pull-archive-z.sh
-index 2ea2387..66f8873 100755
---- a/tests/test-pull-archive-z.sh
-+++ b/tests/test-pull-archive-z.sh
-@@ -23,4 +23,4 @@ set -euo pipefail
-
- setup_fake_remote_repo1 "archive-z2"
-
--. ${SRCDIR}/pull-test.sh
-+. ${test_srcdir}/pull-test.sh
+++ /dev/null
-test-xattrs-use-TAP-syntax-to-skip-test.patch
-various-tests-skip-if-temp-directory-lacks-xattr-support.patch
-Symlink-libreaddir-rand.so-into-tests-directory.patch
-tap-test-clean-up-temporary-test-directories-as-intended.patch
-In-tests-that-use-gpg-terminate-the-gpg-agent-after-testi.patch
-Load-g-i-bindings-from-builddir-during-build-time-testing.patch
-tests-admin-test.sh-this-is-a-bash-script-not-a-POSIX-sh-.patch
-Skip-tests-that-run-rofiles-fuse-if-dev-fuse-or-etc-mtab-.patch
-Probe-for-GNU-parallel-more-accurately.patch
-libtest.sh-use-G_TEST_SRCDIR-G_TEST_BUILDDIR-to-find-reso.patch
-test-xattrs-sync-how-this-is-skipped-with-test-rofiles-fu.patch
-libtest.sh-only-check-whether-pwd-is-empty-once.patch
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 08:24:56 +0100
-Subject: tap-test: clean up temporary test directories as intended
-
-The script created ./.testtmp but looked for ./.test, which isn't
-going to work.
-
-This means the various "ostree trivial-httpd --autoexit" processes
-actually exit, because their web roots are cleaned up now.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/47fd5c74f1428d4cc02ff0061a4958c4b714e852
----
- buildutil/tap-test | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildutil/tap-test b/buildutil/tap-test
-index e791454..6b2eb5c 100755
---- a/buildutil/tap-test
-+++ b/buildutil/tap-test
-@@ -13,7 +13,7 @@ touch ${tempdir}/.testtmp
- function cleanup () {
- if test -n "${TEST_SKIP_CLEANUP:-}"; then
- echo "Skipping cleanup of ${tempdir}"
-- else if test -f ${tempdir}/.test; then
-+ else if test -f ${tempdir}/.testtmp; then
- rm "${tempdir}" -rf
- fi
- fi
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 17:47:36 +0100
-Subject: test-xattrs: sync how this is skipped with test-rofiles-fuse
-
-If we touch test-xattrs before sourcing libtest.sh, we get:
-
-test tmpdir=/tmp/test-tmp-ostree_test-xattrs.sh.test-HSEXEY is not
-empty; run this test via `make check TESTS=`, not directly
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/9c4babf316cfbfad61cfcd0ab8fd5e77e9df13be
----
- tests/test-xattrs.sh | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/tests/test-xattrs.sh b/tests/test-xattrs.sh
-index 2f2d99c..cdc06e8 100755
---- a/tests/test-xattrs.sh
-+++ b/tests/test-xattrs.sh
-@@ -19,15 +19,11 @@
-
- set -euo pipefail
-
--touch test-xattrs
--if ! setfattr -n user.testvalue -v somevalue test-xattrs; then
-- echo "1..0 # SKIP: cannot run setfattr"
-- exit 0
--fi
-+. $(dirname $0)/libtest.sh
-
--echo "1..2"
-+skip_without_user_xattrs
-
--. $(dirname $0)/libtest.sh
-+echo "1..2"
-
- setup_test_repository "archive-z2"
-
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 28 Mar 2016 13:08:32 +0100
-Subject: test-xattrs: use TAP syntax to skip test
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/c276025466af4319d603fe8b534dd3463818a168
----
- tests/test-xattrs.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test-xattrs.sh b/tests/test-xattrs.sh
-index 6a83a0b..2f2d99c 100755
---- a/tests/test-xattrs.sh
-+++ b/tests/test-xattrs.sh
-@@ -21,7 +21,8 @@ set -euo pipefail
-
- touch test-xattrs
- if ! setfattr -n user.testvalue -v somevalue test-xattrs; then
-- exit 77
-+ echo "1..0 # SKIP: cannot run setfattr"
-+ exit 0
- fi
-
- echo "1..2"
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 09:48:18 +0100
-Subject: tests/admin-test.sh: this is a bash script, not a POSIX sh script
-
-The "function foo()" syntax is bash-specific, and Colin indicated in
-PR #226 that he prefers to require bash rather than trying to support
-every POSIX shell.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/1dd85513e540ef0b42f2fee7238fa1f710eaa4ca
----
- tests/admin-test.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/admin-test.sh b/tests/admin-test.sh
-index 3a04a69..43dcbb5 100755
---- a/tests/admin-test.sh
-+++ b/tests/admin-test.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
- #
- # This library is free software; you can redistribute it and/or
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 31 Mar 2016 11:06:05 +0100
-Subject: various tests: skip if temp directory lacks xattr support
-
-Some autobuilder environments place the entire build chroot on tmpfs, so
-even /var/tmp might not have this.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/3e3755c497bd85e22b01829c5715119d46394687
----
- tests/libtest.sh | 8 ++++++++
- tests/test-basic-user.sh | 6 ++++--
- tests/test-delta.sh | 2 ++
- tests/test-demo-buildsystem.sh | 2 ++
- tests/test-local-pull.sh | 6 ++++--
- tests/test-prune.sh | 2 ++
- tests/test-rofiles-fuse.sh | 3 +++
- 7 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/tests/libtest.sh b/tests/libtest.sh
-index 06982d2..21de2e8 100755
---- a/tests/libtest.sh
-+++ b/tests/libtest.sh
-@@ -324,3 +324,11 @@ os_repository_new_commit ()
- ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" -b testos/buildmaster/x86_64-runtime -s "Build"
- cd ${test_tmpdir}
- }
-+
-+skip_without_user_xattrs () {
-+ touch test-xattrs
-+ if ! setfattr -n user.testvalue -v somevalue test-xattrs; then
-+ echo "1..0 # SKIP this test requires xattr support"
-+ exit 0
-+ fi
-+}
-diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh
-index f53de89..42e6a86 100755
---- a/tests/test-basic-user.sh
-+++ b/tests/test-basic-user.sh
-@@ -19,10 +19,12 @@
-
- set -euo pipefail
-
--echo "1..1"
--
- . $(dirname $0)/libtest.sh
-
-+skip_without_user_xattrs
-+
-+echo "1..1"
-+
- setup_test_repository "bare-user"
- echo "ok setup"
-
-diff --git a/tests/test-delta.sh b/tests/test-delta.sh
-index 12f54c7..a6fd6f8 100755
---- a/tests/test-delta.sh
-+++ b/tests/test-delta.sh
-@@ -21,6 +21,8 @@ set -euo pipefail
-
- . $(dirname $0)/libtest.sh
-
-+skip_without_user_xattrs
-+
- bindatafiles="bash true ostree"
- morebindatafiles="false ls"
-
-diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh
-index 500eac6..bffa59c 100755
---- a/tests/test-demo-buildsystem.sh
-+++ b/tests/test-demo-buildsystem.sh
-@@ -26,6 +26,8 @@ fi
-
- . $(dirname $0)/libtest.sh
-
-+skip_without_user_xattrs
-+
- echo "1..1"
-
- # Run "triggers" like ldconfig, gtk-update-icon-cache, etc.
-diff --git a/tests/test-local-pull.sh b/tests/test-local-pull.sh
-index a9beb08..50ecbcb 100755
---- a/tests/test-local-pull.sh
-+++ b/tests/test-local-pull.sh
-@@ -19,10 +19,12 @@
-
- set -euo pipefail
-
--echo "1..1"
--
- . $(dirname $0)/libtest.sh
-
-+skip_without_user_xattrs
-+
-+echo "1..1"
-+
- setup_test_repository "archive-z2"
- echo "ok setup"
-
-diff --git a/tests/test-prune.sh b/tests/test-prune.sh
-index 7184ea9..e1796a3 100755
---- a/tests/test-prune.sh
-+++ b/tests/test-prune.sh
-@@ -21,6 +21,8 @@ set -euo pipefail
-
- . $(dirname $0)/libtest.sh
-
-+skip_without_user_xattrs
-+
- setup_fake_remote_repo1 "archive-z2"
-
- echo '1..2'
-diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh
-index 444fbce..ba45959 100755
---- a/tests/test-rofiles-fuse.sh
-+++ b/tests/test-rofiles-fuse.sh
-@@ -25,6 +25,9 @@ if ! fusermount --version >/dev/null 2>&1; then
- fi
-
- . $(dirname $0)/libtest.sh
-+
-+skip_without_user_xattrs
-+
- setup_test_repository "bare-user"
-
- echo "1..5"
projects / ostree.git / commitdiff